From 47ee30db304a0f8af17ce56778858583f43c1811 Mon Sep 17 00:00:00 2001 From: robertl Date: Sat, 25 Jun 2011 22:03:47 +0000 Subject: [PATCH] Fix bug in KML writer for min/max alts. git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4069 f51c46e8-681c-474f-0cfe-069cfd0219fb --- gpsbabel/kml.c | 4 +- gpsbabel/reference/bounds-test.gpx | 53 +++ gpsbabel/reference/bounds-test.kml | 290 ++++++++++++++++ .../reference/track/bounds-test-track.gpx | 55 ++++ .../reference/track/bounds-test-track.kml | 310 ++++++++++++++++++ 5 files changed, 710 insertions(+), 2 deletions(-) diff --git a/gpsbabel/kml.c b/gpsbabel/kml.c index 83634f114..14c0ffa0d 100644 --- a/gpsbabel/kml.c +++ b/gpsbabel/kml.c @@ -574,10 +574,10 @@ void kml_output_trkdescription(const route_head *header, computed_trkdata *td) TD("Description %s", header->rte_desc); } TD2("Distance %.1f %s", distance, distance_units); - if (min_alt != -unknown_alt) { + if (td->min_alt != -unknown_alt) { TD2("Min Alt %.3f %s", min_alt, min_alt_units); } - if (max_alt != unknown_alt) { + if (td->max_alt != unknown_alt) { TD2("Max Alt %.3f %s", max_alt, max_alt_units); } if (td->min_spd) { diff --git a/gpsbabel/reference/bounds-test.gpx b/gpsbabel/reference/bounds-test.gpx index 4ab138b48..dd69a0740 100644 --- a/gpsbabel/reference/bounds-test.gpx +++ b/gpsbabel/reference/bounds-test.gpx @@ -55,6 +55,16 @@ Arrive at: Wildrose Rd Arrive at: Wildrose Rd + + Head east on Airport Rd + go 0.8 mi + go 0.8 mi + + + Arrive at: Airport Rd + Arrive at: Airport Rd + Arrive at: Airport Rd + Low Road Generated from track Route @@ -443,4 +453,47 @@ RPT430 + + No Elevation Route + Generated from track No Elevation Route + + RPT001 + + + RPT002 + + + RPT003 + + + RPT004 + + + RPT005 + + + RPT006 + + + RPT007 + + + RPT008 + + + RPT009 + + + RPT010 + + + RPT011 + + + RPT012 + + + RPT013 + + diff --git a/gpsbabel/reference/bounds-test.kml b/gpsbabel/reference/bounds-test.kml index be7a15ad8..d37be017d 100644 --- a/gpsbabel/reference/bounds-test.kml +++ b/gpsbabel/reference/bounds-test.kml @@ -140,6 +140,21 @@ -117.226936,36.494947,669.80 + + Head east on Airport Rd + go 0.8 mi + #waypoint + + -116.879080,36.463670 + + + + Arrive at: Airport Rd + #waypoint + + -116.865720,36.460860 + + Routes @@ -2168,6 +2183,281 @@ + + No Elevation Route + + Points + + RPT001 + + + Longitude: -116.879080 + Latitude: 36.463670 + + ]]> + + -116.879080 + 36.463670 + 66 + + #route + + -116.879080,36.463670 + + + + RPT002 + + + Longitude: -116.878300 + Latitude: 36.463860 + + ]]> + + -116.878300 + 36.463860 + 66 + + #route + + -116.878300,36.463860 + + + + RPT003 + + + Longitude: -116.878140 + Latitude: 36.463880 + + ]]> + + -116.878140 + 36.463880 + 66 + + #route + + -116.878140,36.463880 + + + + RPT004 + + + Longitude: -116.877910 + Latitude: 36.463840 + + ]]> + + -116.877910 + 36.463840 + 66 + + #route + + -116.877910,36.463840 + + + + RPT005 + + + Longitude: -116.876800 + Latitude: 36.463450 + + ]]> + + -116.876800 + 36.463450 + 66 + + #route + + -116.876800,36.463450 + + + + RPT006 + + + Longitude: -116.872870 + Latitude: 36.462240 + + ]]> + + -116.872870 + 36.462240 + 66 + + #route + + -116.872870,36.462240 + + + + RPT007 + + + Longitude: -116.868650 + Latitude: 36.460990 + + ]]> + + -116.868650 + 36.460990 + 66 + + #route + + -116.868650,36.460990 + + + + RPT008 + + + Longitude: -116.868250 + Latitude: 36.461010 + + ]]> + + -116.868250 + 36.461010 + 66 + + #route + + -116.868250,36.461010 + + + + RPT009 + + + Longitude: -116.867660 + Latitude: 36.461210 + + ]]> + + -116.867660 + 36.461210 + 66 + + #route + + -116.867660,36.461210 + + + + RPT010 + + + Longitude: -116.867020 + Latitude: 36.460950 + + ]]> + + -116.867020 + 36.460950 + 66 + + #route + + -116.867020,36.460950 + + + + RPT011 + + + Longitude: -116.866830 + Latitude: 36.460910 + + ]]> + + -116.866830 + 36.460910 + 66 + + #route + + -116.866830,36.460910 + + + + RPT012 + + + Longitude: -116.866460 + Latitude: 36.460860 + + ]]> + + -116.866460 + 36.460860 + 66 + + #route + + -116.866460,36.460860 + + + + RPT013 + + + Longitude: -116.865720 + Latitude: 36.460860 + + ]]> + + -116.865720 + 36.460860 + 66 + + #route + + -116.865720,36.460860 + + + + + Path + #lineStyle + + 1 + + -116.879080,36.463670 + -116.878300,36.463860 + -116.878140,36.463880 + -116.877910,36.463840 + -116.876800,36.463450 + -116.872870,36.462240 + -116.868650,36.460990 + -116.868250,36.461010 + -116.867660,36.461210 + -116.867020,36.460950 + -116.866830,36.460910 + -116.866460,36.460860 + -116.865720,36.460860 + + + + diff --git a/gpsbabel/reference/track/bounds-test-track.gpx b/gpsbabel/reference/track/bounds-test-track.gpx index 3e28d9ec0..996f36d3a 100644 --- a/gpsbabel/reference/track/bounds-test-track.gpx +++ b/gpsbabel/reference/track/bounds-test-track.gpx @@ -55,6 +55,16 @@ Arrive at: Wildrose Rd Arrive at: Wildrose Rd + + Head east on Airport Rd + go 0.8 mi + go 0.8 mi + + + Arrive at: Airport Rd + Arrive at: Airport Rd + Arrive at: Airport Rd + Low Road Generated from route Route @@ -447,4 +457,49 @@ + + No Elevation Route + Generated from route No Elevation Route + + + RPT001 + + + RPT002 + + + RPT003 + + + RPT004 + + + RPT005 + + + RPT006 + + + RPT007 + + + RPT008 + + + RPT009 + + + RPT010 + + + RPT011 + + + RPT012 + + + RPT013 + + + diff --git a/gpsbabel/reference/track/bounds-test-track.kml b/gpsbabel/reference/track/bounds-test-track.kml index 3bb3be92b..342378f39 100644 --- a/gpsbabel/reference/track/bounds-test-track.kml +++ b/gpsbabel/reference/track/bounds-test-track.kml @@ -144,6 +144,21 @@ -117.226936,36.494947,669.80 + + Head east on Airport Rd + go 0.8 mi + #waypoint + + -116.879080,36.463670 + + + + Arrive at: Airport Rd + #waypoint + + -116.865720,36.460860 + + Tracks @@ -2285,6 +2300,301 @@ + + No Elevation Route + + + + Description Generated from route No Elevation Route + Distance 4170.5 ft + ]]> + + + Points + + RPT001 + + + Longitude: -116.879080 + Latitude: 36.463670 + Heading: 309.6 + + ]]> + + -116.879080 + 36.463670 + 66 + + #track + + -116.879080,36.463670 + + + + RPT002 + + + Longitude: -116.878300 + Latitude: 36.463860 + Heading: 73.1 + + ]]> + + -116.878300 + 36.463860 + 66 + + #track + + -116.878300,36.463860 + + + + RPT003 + + + Longitude: -116.878140 + Latitude: 36.463880 + Heading: 81.2 + + ]]> + + -116.878140 + 36.463880 + 66 + + #track + + -116.878140,36.463880 + + + + RPT004 + + + Longitude: -116.877910 + Latitude: 36.463840 + Heading: 102.2 + + ]]> + + -116.877910 + 36.463840 + 66 + + #track + + -116.877910,36.463840 + + + + RPT005 + + + Longitude: -116.876800 + Latitude: 36.463450 + Heading: 113.6 + + ]]> + + -116.876800 + 36.463450 + 66 + + #track + + -116.876800,36.463450 + + + + RPT006 + + + Longitude: -116.872870 + Latitude: 36.462240 + Heading: 110.9 + + ]]> + + -116.872870 + 36.462240 + 66 + + #track + + -116.872870,36.462240 + + + + RPT007 + + + Longitude: -116.868650 + Latitude: 36.460990 + Heading: 110.2 + + ]]> + + -116.868650 + 36.460990 + 66 + + #track + + -116.868650,36.460990 + + + + RPT008 + + + Longitude: -116.868250 + Latitude: 36.461010 + Heading: 86.4 + + ]]> + + -116.868250 + 36.461010 + 66 + + #track + + -116.868250,36.461010 + + + + RPT009 + + + Longitude: -116.867660 + Latitude: 36.461210 + Heading: 67.1 + + ]]> + + -116.867660 + 36.461210 + 66 + + #track + + -116.867660,36.461210 + + + + RPT010 + + + Longitude: -116.867020 + Latitude: 36.460950 + Heading: 116.8 + + ]]> + + -116.867020 + 36.460950 + 66 + + #track + + -116.867020,36.460950 + + + + RPT011 + + + Longitude: -116.866830 + Latitude: 36.460910 + Heading: 104.7 + + ]]> + + -116.866830 + 36.460910 + 66 + + #track + + -116.866830,36.460910 + + + + RPT012 + + + Longitude: -116.866460 + Latitude: 36.460860 + Heading: 99.5 + + ]]> + + -116.866460 + 36.460860 + 66 + + #track + + -116.866460,36.460860 + + + + RPT013 + + + Longitude: -116.865720 + Latitude: 36.460860 + Heading: 90.0 + + ]]> + + -116.865720 + 36.460860 + 66 + + #track + + -116.865720,36.460860 + + + + + Path + #lineStyle + + 1 + + -116.879080,36.463670 + -116.878300,36.463860 + -116.878140,36.463880 + -116.877910,36.463840 + -116.876800,36.463450 + -116.872870,36.462240 + -116.868650,36.460990 + -116.868250,36.461010 + -116.867660,36.461210 + -116.867020,36.460950 + -116.866830,36.460910 + -116.866460,36.460860 + -116.865720,36.460860 + + + + -- 2.30.2